Skip to content

WIP: JSONAPI prefix #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 9 commits into from
Closed

WIP: JSONAPI prefix #458

wants to merge 9 commits into from

Conversation

n2ygk
Copy link
Contributor

@n2ygk n2ygk commented Aug 20, 2018

Description of the Change

Per a discussion with @sliverc, renamed recently-added paginations class from JsonApi-prefix to JSONAPI-prefix. This includes new deprecation warnings for the old names.

I also added a minor fix to tox.ini not to run flake8 on the entire directory but only the relevant files.
You can cherry-pick that out if you prefer it not to be part of this PR.

Checklist

  • PR only contains one change (considered splitting up PR)
  • unit-test added (no change; just class renamed)
  • documentation updated
  • changelog entry added to CHANGELOG.md
  • author name in AUTHORS

@n2ygk n2ygk requested a review from sliverc August 20, 2018 19:23
@n2ygk n2ygk changed the title Jsonapi prefix JSONAPI prefix Aug 20, 2018
@codecov-io
Copy link

codecov-io commented Aug 20, 2018 •
edited
Loading

Codecov Report

Merging #458 into master will decrease coverage by 0.1%.
The diff coverage is 73.68%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #458      +/-   ##
==========================================
- Coverage   93.24%   93.13%   -0.11%     
==========================================
  Files          54       54              
  Lines        3123     3134      +11     
==========================================
+ Hits         2912     2919       +7     
- Misses        211      215       +4
Impacted Files Coverage Δ
example/tests/unit/test_pagination.py 100% <100%> (ø) ⬆️
example/views.py 91.89% <66.66%> (ø) ⬆️
rest_framework_json_api/pagination.py 89.06% <73.33%> (-5.28%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96c533b...24bd89d. Read the comment docs.

@n2ygk
Copy link
Contributor Author

n2ygk commented Aug 21, 2018

Dammit every time I try a rebase I get something backward and now it shows 12 files being changed.

@n2ygk
Copy link
Contributor Author

n2ygk commented Aug 21, 2018

In general the way to get the best of both worlds is to rebase local changes you’ve made but haven’t shared yet before you push them in order to clean up your story, but never rebase anything you’ve pushed somewhere. -- https://git-scm.com/book/en/v2/Git-Branching-Rebasing

OK, merge it is from now on.

sliverc
sliverc requested changes Aug 21, 2018
View reviewed changes
Copy link
Member

@sliverc sliverc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for going to an extra effort to make DJA more consistent with the JSONAPI renaming.

Beside the small change I think we have to get the merge rebase issue sorted (PR currently contains changes of previous PRs) and this should be ready for merging.

Maybe to fix your rebase issue what you could do is to create a new branch based on master, then cherry pick the changes you actually made for this PR and force push to JSONAPI-prefix.

tox.ini
@@ -20,7 +20,7 @@ commands =

[testenv:flake8]
deps = flake8
commands = flake8
commands = flake8 --exclude=migrations rest_framework_json_api example
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flake8 configuration is to be found in the setup.cfg. I think for consistency we should move all options there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll clean up my mess. Just found another small error in the deprecation warnings as well.

@n2ygk n2ygk changed the title JSONAPI prefix WIP: JSONAPI prefix Aug 21, 2018
@n2ygk
Copy link
Contributor Author

n2ygk commented Aug 21, 2018

closing this PR so I can undo the rebase message and resubmit.

@n2ygk n2ygk closed this Aug 21, 2018
@n2ygk n2ygk mentioned this pull request Aug 21, 2018
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sliverc sliverc sliverc requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@n2ygk @codecov-io @sliverc